From 978e9bef8c3db26dc2bd502fbcde8be043748995 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 22 Apr 2008 10:29:32 +0100 Subject: [PATCH] hotplug scripts: Fix sharing check for blktap Run check_blktap_sharing() only when a disk is added to guest with blktap. A check_blktap_sharing() doesn't have to be run when a disk is removed. Signed-off-by: Hirofumi Tsujimura Signed-off-by: Takanori Kasai --- tools/examples/blktap | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/examples/blktap b/tools/examples/blktap index 7016e299d1..91d3f8994e 100644 --- a/tools/examples/blktap +++ b/tools/examples/blktap @@ -54,10 +54,6 @@ check_blktap_sharing() echo 'ok' } -FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") -FRONTEND_UUID=$(xenstore_read "/local/domain/$FRONTEND_ID/vm") -mode=$(xenstore_read "$XENBUS_PATH/mode") -mode=$(canonicalise_mode "$mode") t=$(xenstore_read_default "$XENBUS_PATH/type" 'MISSING') if [ -n "$t" ] @@ -77,15 +73,21 @@ else file="$p" fi -if [ "$mode" != '!' ] -then - result=$(check_blktap_sharing "$file" "$mode") - [ "$result" = 'ok' ] || ebusy "$file already in use by other domain" -fi - if [ "$command" = 'add' ] then [ -e "$file" ] || { fatal $file does not exist; } + + FRONTEND_ID=$(xenstore_read "$XENBUS_PATH/frontend-id") + FRONTEND_UUID=$(xenstore_read "/local/domain/$FRONTEND_ID/vm") + mode=$(xenstore_read "$XENBUS_PATH/mode") + mode=$(canonicalise_mode "$mode") + + if [ "$mode" != '!' ] + then + result=$(check_blktap_sharing "$file" "$mode") + [ "$result" = 'ok' ] || ebusy "$file already in use by other domain" + fi + success fi -- 2.30.2